Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 9 Oct 2020 13:35:57 +0000 (13:35 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 9 Oct 2020 13:35:57 +0000 (13:35 +0000)
Matthiasc/for master

Closes #3242 and #3240

See merge request GNOME/gtk!2679


Trivial merge